Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 20:43:14 +0000 (13:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 20:43:14 +0000 (13:43 -0700)
commitafe961bbebc5bdc1548380df03532a70fb78cd08
tree7d6381a1fd6cbf2a25f281909ea56fb39e7b748a
parenteea55e41f763a54db97b308f3b2dffba1990ee09
parentde608489c24b2ab5423a09512489b3b52ba96247
Merge from trunk.
src/ChangeLog